From 6189fd3e9220942f9a9896eb0cceb6589102e8fc Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 1 Feb 2019 16:49:33 +0000 Subject: [PATCH] oxenstored: Build it * Add the relevant build dependencies ocaml-native-compilers is good on stretch because it will get us better output code. In buster the ocaml-native-compilers package is merged into ocaml-nox. In bullseye we can drop ocaml-native-compilers from the list. * Drop the rules line that disables the ocaml build. * Ship /etc/xen/oxenstored.conf. * Placate dh_missing about ocaml development libraries. Signed-off-by: Ian Jackson [add trailing comma, fix typo, change bulleseye line] Signed-off-by: Hans van Kranenburg --- debian/control | 4 +++- debian/not-installed | 5 +++++ debian/rules | 1 - debian/xen-utils-common.install | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index b7b670cd9c..72dc3e76de 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,9 @@ Build-Depends: uuid-dev, zlib1g-dev, pandoc, - markdown + markdown, + ocaml-native-compilers | ocaml-nox, + ocaml-findlib, XS-Python-Version: current Homepage: https://xenproject.org/ Vcs-Browser: https://salsa.debian.org/xen-team/debian-xen diff --git a/debian/not-installed b/debian/not-installed index 17a331400e..5ffa447587 100644 --- a/debian/not-installed +++ b/debian/not-installed @@ -23,3 +23,8 @@ etc/xen/README # some of the code in the upstream init scripts. etc/xen/README.incompatibilities +# When we build with ocaml support, do not try to ship development +# libraries which we don't understand and are of limited use. +# If someone wants this, suggestions from ocaml experts on what +# to ship where would be welcome. +usr/local/lib/ocaml diff --git a/debian/rules b/debian/rules index 09babb2133..d6a626430e 100755 --- a/debian/rules +++ b/debian/rules @@ -182,7 +182,6 @@ override_dh_auto_configure: --with-libexec-leaf-dir=xen-$(upstream_version) \ --disable-blktap1 \ --disable-blktap2 \ - --disable-ocamltools \ --disable-qemu-traditional --disable-rombios \ --with-system-qemu=/usr/bin/qemu-system-i386 \ --enable-ovmf --with-system-ovmf=/usr/share/ovmf/OVMF.fd \ diff --git a/debian/xen-utils-common.install b/debian/xen-utils-common.install index efd0fa25ed..0f6cb8e3c2 100644 --- a/debian/xen-utils-common.install +++ b/debian/xen-utils-common.install @@ -3,6 +3,7 @@ etc/xen/xl* etc/bash_completion.d/xl.sh usr/share/bash-completion/completions/ etc/default/xendomains +etc/xen/oxenstored.conf usr/bin usr/sbin -- 2.30.2